Merge "Capture transaction traces before system reboot" into main