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

Change-Id: Id4d48c63e9653377ebbd3eabebdfcf42f2c445fd