Merge "Additional API change after feedback"