Update type.
Merge branch 'development'