Merge commit 'egit/zawir/corechanges'