1. Bugs fixed.
2. Sync with the main branch.