Merge "Add an immutable AdditionalSubtypeMap class" into main