Merge commit 'e20d7001c3f7150400169fecb0bf0eefdf122fe2' into vm-check