Merge "Fix the NPE of testSingleLine." into lmp-sprout-dev