Branch 'v1.4' - 2 commits - server/update-master-directory-list