Re #8023 and #7529. commenting out conflicting test branches.