Esm modules fix#1677

Roaders wants to merge 4 commits intomainfinos/FDC3:mainfrom

esm-modules-fixfinos/FDC3:esm-modules-fixCopy head branch name to clipboard