WIP: porting akkamaddi's Sterling & Black to 1.7.2