jlopp merge v25 upstream changes