Merge from

December 25, 2025 by jlamprecht