[DF-3363] Changed way to detect hanging object
Merge branch 're_stable' into development