Moving NUSCs to hotfixes