Merge branch 'types' into dev
Update changelog
Merge branch 'dev'