SPOPT-1569, 1576 - incorporated code review comments
SPOPT-1569, 1576 - incorporated code review comments

mpundlik/cn-infra,ligato/cn-infra,jozef-slezak/cn-infra,junmipan/cn-infra,lukasmacko/cn-infra,junmipan/cn-infra,jozef-slezak/cn-infra,ligato/cn-infra,lukasmacko/cn-infra,mpundlik/cn-infra