Merge pull request #11457 from hydra/bf-fix-elrs-issues-1