am 8aec061f: Merge "Fallback to quick in case of soft verification errors"

* commit '8aec061f5e58876bcc892d8c0309bc13b5349f5c':
  Fallback to quick in case of soft verification errors