Merge "Add flag for fixing TransactionTooLarge exception while UI is coming up" into main