..F....... [ZBX-8232] minor code refactoring to prevent conflicts in later versions