Sync with Release v0.3.1