ZEN-11054: ported from patch ZEN-11222