Merge pull request #11456 from hydra/bf-fix-exti-issues-1