This task is being split out from 1454.