Folders: add another option: SkipLastOnlyIfGreater1
Merge branch 'folders'