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