Merge "Remove usages of global transaction" into main