Merge branch 'release/1.7.1'
Merge branch 'release/1.8.0'
hotfix: imagetext query needs id, not name
Merge branch 'hotfix/1.8.1' into develop