Merge branch 'hotfix/0.6.2'
Attempt to fix server reconciliation
Merge branch 'hotfix/0.6.3' into develop