Changes from review
Merge branch 'issue-284' of https://github.com/aodn/aodn-portal into issue-284