Merge "Avoid redundant AdditionalSubtypeMapRepository#putAndSave()" into main