Merge "Follow-up to I8ed99c68f8012cd0bf9244f749138ccbd9a3420b" into mcp/antelope