[rubbos] (bug-fix) Ditto
[rubbos] (bug-fix) Ditto

yungsters/rain-workload-toolkit,sguazt/rain-workload-toolkit,yungsters/rain-workload-toolkit,yungsters/rain-workload-toolkit,sguazt/rain-workload-toolkit,sguazt/rain-workload-toolkit