Merge "Fix vcp template errors, remove extra quotes"