Merge hotfix-0.5.1-alpha into develop.