Minor refactoring to reduce unneeded allocations.
Update version number for release.
Merge branch 'release/1.2.3'