Case 2607 - Added hooks.
Case 2607 - Code review.
Merge branch 'case-2607' into develop

* case-2607:
  Case 2607 - Code review.
  Case 2607 - Added hooks.