(commit amended by alessandro to avoid #ifdef in the functions) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>