Commiting bill's patch in jira issue 675

10 files changed