Enforce convergence
Adjust settings to less aggressively prefer large mappers
Merge remote-tracking branch 'remotes/origin/master' into MR1