Fixes for beta 1
Merge branch 'release/1.17' into dev