Merge remote-tracking branch 'origin/release_1.23.0'

Change-Id: I7a6181470a7c5182db8fc30c550d5dc13ad17e66