Sync with new version 1.3.21