Jira - SAEN-33