Closes https://app.asana.com/0/533607495357/533607495416