https://its.cern.ch/jira/browse/ATGCS-734