[Eas-dev] [PATCH 0/3] Fixes for EAS backport to 3.18