Improvement to machine form
Issue-273-machine-improvement
Merge branch 'current-sprint' into 271-provenance