*8582* accomodate omp specific changes