US79445: moving v2 code samples up a level