RAZ-3149 : Sub folders did not wrap properly
Merge branch 'develop'

* develop:
  RAZ-3149 : Sub folders did not wrap properly