JIRA-123: Pull this feature