Fixed #7981 -- Wrap the manual transaction management in the