Merging in moves hotfix.