Merge branch 'development'
Version bump to include package.json file

[No CI]
Remove additional handlers, opt for headers field

Reverts most of 6a698b2.