Merge branch 'es/mw-to-git-chain-fix'