Merge "Fixes unnecessary multi-merge steps."