Merge branch 'es/check-non-portable-pre-5.10'