This fixes #40001 (closed).
assigned to @cohosh
Nice, looks good to me.
merged
mentioned in commit 387f2b40