Merge pull request #4270 from MartijnKaijser/addondisabled