Merge pull request #4260 from jmarshallnz/addon_improvements