Updates
Merge branch 'refs/heads/dev' into legacy-0.8.22