Merge remote-tracking branch 'origin/release/2.47'