Setup new branch
Imported viable patch.