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