Merge "Added generic hook for loading vendor specific defintions"