Merge changes for trq-1736 - fix for pbs server crash.