Merging recent roots changes