match: Update to v0.16