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