Merge branch 'hotfix/0.6.1-bhadrak'
Merge branch 'master' into develop