normalize vendor settings handling, make it optional in all cases