Merge "Followup to Ic78a3b5d092aa9a6fd8343a856ef188dafe70b49" into mcp/caracal