This MR also updates reference files after !61054 (merged).
Fixes https://its.cern.ch/jira/browse/ATEAM-892