Issue 2999

WIP PR, looking for comments