BC-2235 CurrencyLabel and MeasureLabel improved fix