Revert "First commit"

This reverts commit 35730e56fb0a05bcdf645a63a1484fd11c081a11.
Merge remote-tracking branch 'upstream/develop' into develop

Merge upstream/develop update.