Merge "Fixed dummy root creation"