Merge "Fixing folder order persistence (issue 6176721)" into jb-dev