move hybrid settings to pa-cm-10.1 branch