Merge branch 'better-api-generation' into 'master'

Better api generation

See merge request !13
3 jobs for 26-creation-of-jar-in-ci-fails in 4 minutes and 5 seconds (queued for 1 second)