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

Change-Id: I3628e58fb6a24f2560e6962044e9dfa8cc942f3a