Merge "Test harness sync" into devel/master