Merge branch 'mzhaom-movedir'