Merge branch 'release-1.2.3' into stable