I think these are v3.1 only issues