[PATCH 0/2] Improvements to AVC record matching