Merge "Add final where needed"