MERGE 1.3.6 ROOT/2