Update epos references

Gloria Cortirequested to merge
update-epos-ref into master

This is on top of !851 (merged) so that it should not have conflicts with it.

Merge request reports