Fix merge problem due to removal of daemonCoreSockAdapter in 8.3.
Merge branch 'V8_3_0-branch'