Merge pull request #13560 from odmdas/odmdas-freeradius3-meta