Fix another disappearing-goods bug with factory coverage.
Merge branch 'ncn-devel' into merge-from-standard