Update version
Merge branch 'rel-0.5.3' into stable
Merge branch 'stable'