Created by: novoselrok
Fixes #25561 (closed) Fixes #24505 (closed)
Depends on #25674
Push commits to the source branch or add previously merged commits to review them.