Some helpers in the developer tools page
Merge branch 'develop'