Check in the missing changes from checking 77d90af..f37c5bb for the rework fix for TRQ-2378: MOM crash on obit handling.