Merge remote-tracking branch 'upstream-restricted/pr/487' into development