EPNET-667 is addressed with this

Merge this for the release