uksm-3.16: adopt to 3.16 changes
Merge branch 'uksm-3.16' into pf-3.16