Merge "StateMachineObituary: Fix LogRecs out of order" into sc-dev