Merge "Fix transaction phase offsets" into pi-dev