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