Feature/backlog 1349