MDL-37457 testing Refactoring references
MDL-37457 testing Keeping current classes as deprecated