Merge "Breaking up 6360: Adding base features"