Update requested by DPM office

https://www.pivotaltracker.com/story/show/55176216