[merge addon] Initial add