Merge "Fix api-handler config"