[#2636] Backporting syntax fix