Merge "[VVP] Added support to display terms and force acceptance if desired"