Improved machine view to use bunk update.
Merge branch 'test' into dev