Merge pull request #12232 from Dentomologist/convert_objectsubtype_to_enum_class IOSC: Convert ObjectSubType to enum class
