Merge "Add support for bindep"