Merge cdb branch with cdb dev
Merge remote-tracking branch 'origin/CDB-293_title_in_legends' into release/2.1.3.5