UKSM 0.1.2.2

This is a Squshed Commit of two UKSM patches.