Port of 37220-es-modules to EE

Merged Filipa Lacerda requested to merge ee-37220-es-modules into master