Updated version of ESRM20

Merged Cecilia Nievas requested to merge update/esrm20 into master

\approve @fd

\fyi @gislars

Merge request reports