Merge "Fix NPE for stability tests" into klp-dev