Merge branch 'moves_module'