Merge "Fix overlooked reference during refactoring" into sc-dev