Merged a tweak from work.