Merge branch 'develop'
Sets version to 0.23.0-dev