CDB-2000 #resolve - single quotes not escaped in category wizard
Merge CDB-2000 into release/2.11.1