Fixes
Merge branch 'kk44' of https://github.com/wSedlacek/vendor_vanir-private into kk44