Merge "Reduce complexity of Test Mapping related code in `main`" into main