Merge "Replace stream().min() to Collections.min() to avoid stream object." into udc-dev