Wrap transaction in a using statement
Merge branch 'master' into NET_40