merge sirius 7.17
fix wrong vendor path