Revert "Merge remote-tracking branch 'upstream/master' into develop 854327aabacb60818f8c2a91a135c92e684c3291"

This reverts commit 326d467c04973bcdd4ef72b6dbe047cfbe48d77e.