Merge branch 'master' into release
Version bump (0.17.2)
Merge branch 'release'