Merge branch 'unify_configkeys' into 'master'

Unify Configuration Keys

Closes #46

See merge request !81
18 jobs for master in 17 minutes and 55 seconds (queued for 1 second)
Scheduled