avalara_capture does not go to rescue anymore
Merge branch '2-3-stable-acr' into 2-3-stable