Merge branch 'core68' into next