Condition 2 check modified in find_delta, modification in elemets
Merge remote-tracking branch 'upstream/master'