merge folder support from mavericks version