chore: Merge V0.13.x dev into master

Closes #234 and completes Milestone v0.13.x