Resync with current 3.12 modulesets