preparing impl for #COP-92, comment due it need performance fixes