Fixed issues from Asana:
* zd-1813
CL