Merge "Introduce common directory"