Merge "API update"