Merge "Expand Duo Interface"