Merge commit 'feccd2d3100fd2964d4c2df58ab3da7ce4949a66' into vm-check