New PR on 4_5_x here:
https://github.com/xtuple/xtuple/pull/1451