Merge "Add transaction code to TimeCheck crash"