Merge "Fixes expired response does not work with augmented autofill" into rvc-dev