update type short
Merge branch 'feature-utility' into develop