4 Commits (fix-grid-autoalign)