Hi Raghav,

could you consider updating the patch to incorporate Efraim's changes,
if desired?