Merge "Added missing return."