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