resync with current 3.8 modulesets