Feature/sshoc conflict at source flag

Eliza Kalatarequested to merge
feature/SSHOC-conflict_at_source_flag into develop

The goal was to fix issue with casting and comparision of 3 items.

Merge request reports