Merge "Use new API to load mapper" into main