Fixed channel encryption still active after disconnection
Merge branch '2.1.17-gpc' into master-gpc