Merge "Fix folder order regression (issue 6482634)" into jb-dev