(#1658) - WIP -move into own dependency