Revert "Revert "Merge remote branch 'upstream/dev' into dev""

This reverts commit cdb5a026977663867e61661d330cda022d29853e.