Merge remote-tracking branch 'official/master' into per-axis-grid