Merge from 4.5.0 for the rework of trq-2378: MOM crash on obit handling.