Merge "Require mapper4" into main