Merge branch '2419_smb_configdir'