Resolved JBQA-7844