Fixes
Merge branch 'merge-latest'