Make similar changes to 3.x version.
1 file changed