Merge "Fix broken min() call in OutputPage"