Merge "Keep up with API change"