Improved preliminary support for restriction folders
Improved preliminary support for restriction folders