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