Pedro Igor I did not plan to work on this right away, so feel free to take it over. Once your fixes is done, i'll take care of backporting to upstream (JBEAP-3888).