#14738 corrupt class dirs
#14507
#14717
#14719
merge
fix move class defaults
rename old class defaults instead of del