Feature/jira 1235

JIRA tracking