Merge "Fixed CCVPN closed loop integration issue"