Merge branch 'nd/mv-code-cleaning' into jch