Moved to add-on framwework, added merge tags