[conflict] Merge main (v0.6.1) into pre-0.7 to resolve the conflict (#253)

There are conflicts between v0.6.1 (main) and the pre-0.7 branches. We
have to resolve them by first merging main to pre-0.7. This cannot be
done via a squash.

@shivasankarka, @MadAlex1997, please just approve it and not merge. I
will take of the merging.

Author: forfudan