Picking up editorial fix from 922 branch