Merge "Fix an assertion condition in transform type search" into nextgenv2