dev(Partners): merge various master branches