Merge branch '2874_tilde_directory'