Change API tooltip text
Fix for taxonomy terms
Merge branch 'refs/heads/develop'