Merge fix from 4.5.0 for trq-2378: MOM crash on obit handling.