@masev, @lolautruche i've added a pr for this. https://github.com/ezsystems/ezp-next/pull/224