CDB-60 CDB-61 CDB-63 #resolve markup issues