Merge "Replace IMMS#mAdditionalSubtypeMap with AdditionalSubtypeMapRepository" into main