Merge "String change for emptying folders." into jb-ub-mail-ur9