I've opened this question on devel list as current code does not really work with 5.2...