Sync with winocm's tree
Re-apply changes over updated tree