Merge "Fallback to quick in case of soft verification errors"