This is fixed locally as per my last comment. This work has not yet been pushed to master.