Merge "Grid spacing fixes"