Merge "Add dependency from hv plugin to base plugin"