Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3