.......PS. [ZBX-8040] merged from upstream