Revert "Revert "Merge remote-tracking branch 'remotes/origin/dev'""

This reverts commit 92cfbd440370a21e359c8c5c08a04a831f4a396c.