Merge "Add a missing return." into sc-dev