Merge "Revert "Ensure that health check controller is unbound correctly"" into rvc-dev