Creating a pull request for discussion JIRA_1237

Review the code