Added TODO for issue https://forge.ow2.org/tracker/index.php?func=detail&aid=316206&group_id=23&atid=350023