Merge branch '3.8/uksm' into 3.8/my