Merge branch 'cleanup-api-misc' into 'develop'

Cleanup api misc

See merge request !227
2 jobs from develop in 2 minutes and 31 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #2225
test:7.2

00:01:18

passed #2226
test:7.3-rc

00:01:12