Merge "Fix function return type" into sc-dev