Virtual directory improvements

Jürg Billeterrequested to merge
juerg/directory into master

This branch includes various virtual directory improvements in preparation for #920 (closed) and #921 (closed).

Merge request reports