Issue #3320529 by justcaldwell, RenatoG: block_classes_stored setting only retains classes from most recently saved block