epedev-254

completed work in jira comment