Merge changes back from develop, Machine and Task fully functional