Merge commit 'repo/vlock-2-release' into vlock-2