See:
https://its.cern.ch/jira/browse/SUS-1870
https://its.cern.ch/jira/browse/SUS-1748
https://its.cern.ch/jira/browse/SUS-1866