cherry pick test1 - works using mergetool

cherry pick test1 - works using mergetool