wondering which PR we should use - is it 316 or 399 - since both seem to tackle the same issue