Re: [master] Two minor changes for the addon support