Revert "Merge branch 'fix/2108' into 'master'"

dmitry.mashoshin requested to merge revert-6c1a09d9 into master

This reverts merge request !2423 (merged)

Merge request reports