Merge changes from topic "numFolderRows" into main

* changes:
  Update dump tests
  Make numFolderRows/Columns accept more values