Merged

Merged synced master with Upstream