chore(version): Cherry-pick bug fixes from main for v0.10.1
