hanars Merge pull request #3190 from broadinstitute/dev