Fix UnboundLocalError.
Update version.
Merge branch 'release/1.5.3' into develop