Add BLD and UKSM to 3.12