imported the latest updates from vanir repo