ZEN-11054: ported from ZEN-11222