Merge commit 'c010924a71f942100dc7b4021d5ef1c6decf9c85' into vm-check