Merge branch 'drew_issue1857'