JIRA: PHAROS-161