Merge branch 'hotfix-1.3.0'
Merge branch 'develop'
Fixed typo from tatic to static
Merge branch 'hotfix-1.3.0' into develop