Merge branch 'master' into develop
update types list
update active
update
Merge branch 'develop'