Merge "Add current state to unhandled message error log" into main