Shouldn't TotalOrderStateTransferInterceptor do this?