Implementing feature requested in pivotal #77118098