Jira Isuse: WP-794