Merge "Docs: Fixed info about spanning multiple columns" into nyc-docs