Merge pull request #3311 from nrwahl2/nrwahl2-T620_current
Avoid duplicating option metadata across daemons