Merge "Tweaking grid spacing (5162387)"