am 28b952ad: Merge "Fix folder order regression (issue 6482634)" into jb-dev

* commit '28b952ad3ec46ba9d14063797c1c96984ade8deb':
  Fix folder order regression (issue 6482634)