Use a decimal for unit_multiplier
Merge branch '2-2-stable' into 2-2-nemo-stable