Fix infinite recursion.
Bump version.
Update changelog.
Merge branch 'release/0.23.1' into develop