Change
Fix conflicts
Merge pull request #20 from EternalGoldenBraid/OPS-1519_MT-15205_dum_de_dum

To the open branch using multiple youtrack tickets in branch name.