QA-1746 - updates following review