Merge remote-tracking branch 'upstream/dev' into PAP

Fixes #6844.