Merge "Drop os-ken dependency" into mcp/caracal