SLT-282 fixed issues found in code review and failing test
Merge branch 'SLT-260-review-changes' into next