[15.0] Replace types (#2945)

[15.0] Replace types (#2945) #3592