Merge "Implement some more speed-up : Syncing test harness changes" into devel/master