There have been a number of PRs in Machine that have not made their way into machine.py. We need to go back through the commit logs and figure out what needs to be ported and port it.