Merge intestate v2 into v1

https://www.pivotaltracker.com/story/show/60962326

Base for merge: release_1300