Merge "Remove dependencies on external packages from features and sources"