review comments from Allyson MacDonald
Merge branch 'am_review' into develop