merge vanir upstream changes