Merge changes for VOL-71 into the 4.5-1.3.x branch.