Merge "Fix error where root folder depth was set as 1 instead of 0"