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