.......... [ZBX-8919] Merge from 2.2