[MERGE] mrp : Merged Nehal's branch for UoM calculation fixes