Merge branch 'refs/heads/release'
Switching back to dev-master dependency
Merge branch 'refs/heads/master' into release