Merge "Improve BondStateMachine logging"