Changes font
Merge CDB-1316 into release/2.11.0