Cut over to use sync readers and conns.
Merge branch 'master' into NET_40