chore: Merge V0.13.x dev into master