FLEX-33921 fix rounding issue
FLEX-33990 fix for RTE