No functional changes. Some changes that used JDK stream JDK.