.......... [ZBX-9065] merge from 2.4