further preparations for NSM (#6265)