Use directory reference
Merge branch 'bugs/create_account_references_root_directory-11' into development