Merge "Clear the DBO_TRX flag for sanity in ExternalStore"