PROV-678 merged Kehan's patch