.......... [ZBX-7553] merge from 2.2