[frr] [PATCH v2 04/10] # This is a combination of 2 commits. # The first commit's message is: