CAP-1572 Merge of changes for multidb and multicolor