Merge ktest fix into master