Merge commit '4c9e29ec38350a5206aa3e8e72ad4376512ada2b' into vm-check