Merge "Fix secondary output under&over run"