Completed Asana tasks:
* #5258732946025
Merge branch 'asana-5258732946025' into 043013-candidate