git Merge branch 'slb/ss/sbfldlst' into 'master'

fix: folders missing from list

See merge request !409
4 jobs for !422 with cherry-pick-06ce24332828c7f8a8a5a95f88ac0bb92c00ba99 in 9 minutes and 52 seconds (queued for 3 seconds)
latest merge request