add-on smoke tested and ready to merge