merge of unicode change, adding some db dirty bit columns.