Incorporate changes to the main fork

This merge catches up to the latest changes to main fork