Merge "Fix JIRA directives for empty query results"