ATK4 and Addons from UPSTREAM