DF# QCADOOMES-1482, QCADOOMES-2023 fixes in locales