[WIP] first draft of a fix for #5448

only method stubs so far