Merge "Add state_path config option" into mcp/caracal