ZEN-10128: ported ticket from ZEN-10330