sebbacon Merge pull request #2914 from ebmdatalab/HelenCEBM-patch-1