Merge "Fix for CharSequenceCreator test case"