Merge subdirectory editable feature

Merge of PR #1082 fixed up for latest develop.