Merge "Split concreate and abstract dependencies"