Merge "AddOn manager" into devel/master