integrate latest changes from Perforce repository (revision #6112)