NOREF: catching up with some recent commits to the test branch