Merge in bug fix for 677609