Move source
Merge branch 'refs/heads/master' into release
Corrected solution