Merge in r3786-3788,3794-3795 from sogo branch