Merge "Add the ability to override time origin priorities" into sc-dev