Merged in dir-hierarchy branch