Shared connector options

Change-Id: I111d2e64e9492d16f0639f4eaf4e022a20513410