Following https://its.cern.ch/jira/browse/ATR-28687, this implements subtask 1 of the suggestion by @thompson .
