Fixed race condition that can result in CCB reconnection failure. #3476
Merge branch 'V7_8-branch'