Merge branch 'fix-hook-2' into dev-2
Merge branch 'dev-2' into fix-hook-2