Please, give also a look at my comments in the following Jira issue: https://its.cern.ch/jira/browse/ADTCC-172