JT-1 Test hook again
Merge branch 'bug/1_test_hook' into develop