Merge "Make sure to show the correct URL from CVC" into klp-dev