.......... [ZBX-7335] merge from trunk, resolve conflict in items.php