Moved TS-3257 to 5.2.x