Fix #460 Base product on luna and sirius rc1