Integrated changes made in ST2 Perforce