Merge "ccvpn integration sdnc issue fix"