EPD-34: more refactoring into common.
Merge branch 'master' of https://github.com/dma-enav/EPD