Ordering fix: final

Stewart Martin-Haughrequested to merge
smh/athena:ordering_fix_again into master

Sort set() correctly (previous version with dict keys didn't work).

Fixes ATR-21959

Edited by Stewart Martin-Haugh

Merge request reports