Merge remote-tracking branch 'upstream-public/pr/1382' into development-proposed