hooks - back to the roots
more back-to-the-roots changes
changed regex pattern, fixed unit tests after back-to-the-roots
Merge branch 'DAR-304-code-review-2nd-round' into DAR-304