Merge "Followup to I188ce86d82616a071436f52f831253a16aa09e43" into mcp/antelope