https://www.pivotaltracker.com/story/show/67243394
https://www.pivotaltracker.com/story/show/67243430
https://www.pivotaltracker.com/story/show/67243374
https://www.pivotaltracker.com/story/show/66962922
Merge branch 'feature/transaction-client-updates' into develop