Merge "Add missing return statement"