NT2: Bugfixes to experimental OMP support (defaults to disabled).(cherry picked from commit 884e277d25b7ae441ea1f1ee5aee335fd412ae47)