[build] sync machine config.
add missing box
[remotes] tweak support.
merge fix