Updated
Merge branch 'hotfix/1.5.0-beta1-bugfix1' into develop