Merge branch 'dev' into 'testing'

enabled 'id' as fields-argument

See merge request !156
3 jobs for testing in 1 minute and 26 seconds (queued for 1 second)