Merge "Replace reflection with Suppliers." into tm-dev