Merge "bug fix for ccvpn uc after integration test"