Backup of commit v2025.0.2