feat: upgrade-to-6-1

[Janice38]

Q	A
Bug fix?	yes/no
New feature?	yes/no
BC breaks?	yes/no
Fixed issue	#...

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}