Merge "update ves image tag" into casablanca