Add wait to tests
FAIMS-872 Update merge query
Merge branch 'master' into qa
Updated deployment version