Merge with vlock-2-release