Manual sync with changes on AAtticus/provip