merged update patches from vanir/kk44 branch