Completed Asana tasks:
* ZD-1763
* ZD #1723
Merge branch 'zd-1723'
cl