Fix type in b8482a0c41ae
Automated merge of next-stable