Merge pull bennlich-agents-patches-links