Copied changes from v1 into v2

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