Merge pull request #252 from pflooky/feature/vendor-db-ontos