Committed remnants from phase Ib re. integer transform


Former-commit-id: f6cedbacd50c4f2bb58ae43cdaae741daf72cba1