Add tooling API
Merge branch 'dev'