Merge branch 'development'
Testing hook
Testing hook
...
Regression on delete function on Edit page
Merge branch 'master' into development