merge vuaru changes