Merge branch 'amf/increase_timeout' into sprint48