no trailing spaces in test result needed
Merge branch '2.1' into 2.2