Merge "Specify the full path to atree for the windows.atree"