create a new clean version of this PR https://github.com/Nosto/web-components/pull/665
create a new clean version of this PR #665