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