Merge branch '3836_with_homedir_yes'