Merge branch 'sb/remove-unused-var-from-builtin-add'