Merge commit 'cce8b2ce93703aff953750fb40cb53176ea66504' into vm-check