(cherry picked from commit 6249f4d5b0e63c05f08bce12ca3afebda9f764a3)
date: 2026-08-15T14:20:10 master commit: d48cfa730bf21593b684efeaf3fd8940695e1dea