fix: dev: tidy
new: dev: add merge script
new: dev: allow extended cisco builder
new: dev: allow threading for non-blocking