FAIMS-889: update timeout
Merge branch 'master' into qa