Merge parallels provider code back into master