Fix hooks providers backward compatibility
Merge branch 'fixHooks' into dev