An extended solid modelling kernel for combined analytic and mesh B-Rep faces