merge binary addons changes