Merge branch '2874_tilde_directory' into 4.8.1-stable