Merge "Use set horizon log filename to original"