Task: https://teambox.com/#!/projects/fission-internal/tasks/5608512