Commit e6fc58ea authored by markc's avatar markc

Updating to match first draft of CR

parent dfdd6a61
Pipeline #8663 failed with stage