Merge "3a/ Improve logging around transitions" into main