HHH-4261

Please consider the patch to fix HHH-4261