OpenMP proper support in merged version