Squash UMS commit (3/3)