Initial commit
Fixes for beta 1
Merge branch 'release/1.17'