Merge branch 'eb/core-eol'