Merge "Define face/ServiceProvider and prepare for migration"