[3.5.x] Addons