Merge "Enhancements to workload scripts" into mnc-dev