Remains of #250, also requested by NC-Internal tests.
Remains of #250, also requested by NC-Internal tests.