Completed Asana tasks:
* CL-2138 (details of fix is on Asana task page)