Merge remote-tracking branch 'stevee/core-76-update' into next