Merge "update the SO version for the api-handler"