patch 0001 applied from jira issue 1582
2 files changed