Merge branch '2803_homedir_in_tests' into 4.8.1-stable