Merge branch 'develop'
Merge branch 'develop'
[-] remove unused var
Merge branch 'remove_unused_vars_hotfix' into develop