jira issue 40,41 and 42