fix offset contains condition
Removing custom impl. of TargetElementUtilBase to fix tests
Merge remote-tracking branch 'origin/master'