Created a JIRA ticket for this GL-111