Merge pull request #9933 from lucize/frr