...G...... [ZBX-7098] solution from 2.0 ported to 2.2