(#2515) - WIP - failing test