[master] [PATCH] Fix for the addons kickstart support