Merge "Change the naming of txfm#d_test" into nextgenv2