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