BUG Prevent unnecessary reconstruction of ClassName field after default records are generated
Merge pull request #2916 from tractorcow/pulls/fix-classname-generation

BUG Prevent unnecessary reconstruction of ClassName field