Merge "Handle nested folder case"