Output Merge

Merge AoLi modification