Merge "Avoid div by 0 with HostTest" into oc-dev