Merge branch 'es/warnings-fix' into next