Merge "Bypass data tree generation on empty merge"