Merge branch 'drew_issue1771'