Merge "implement InfraInterfaceController" into main