implement #3618230
Closes #3618230
NOTE: I created that MR with the help of claude code. All changes are reviewed and approved by me.
Edited by Wolfgang Ziegler
Closes #3618230
NOTE: I created that MR with the help of claude code. All changes are reviewed and approved by me.