Merge from sortie:for-valve-posix-vbsp-vvis-vrad-v2-part1