Merge "Make numFolderRows/numFolderColumns accept more values" into main