Merge "vvp healthcheck"