Upcoming

Merged updates and fixes from the "Upcoming" branch