Merge "Fix implicit dependencies"