Merge branch 'develop' into hotfix/0.5.15.3
git-pull working branch before finish any branches with remote option
Merge branch 'hotfix/0.5.15.3' into develop