Merge "Offload I/O writes to a bg thread in AdditionalSubtypeMapRepository" into main