Merge changes for VOL-71 into master (i.e., 1.4).