[#1830] [#1835] fix resc_type check, and also an issue with resource hierarchies when mounting a structured file
[#1830] [#1835] merge with development
[#1830] [#1835] merge with development