Merge "Prevent adding a folder to itself recursively"