Merge "Add missing return value"