This combined MR has been split to address multiversion compatibility:
Please review the split MRs instead.