C3 derwy t7

@georgesamy merge