Continuation of #1674. Sort order of collapsed folders seems to be inverted in comparison to non-collapsed ones. It should be the same, as if path was not collapsed. See the example:

Original, non-collapsed order:

• A
  • src
    • file
• A.X
  • src
    • file

Current collapsed order:

• A.X / src
  • file
• A / src
  • file

Expected collapsed order:

• A / src
  • file
• A.X / src
  • file