Release 1.23.0

Merge branch fixes