#COP-91 fixed
preparing impl for #COP-92, comment due it need performance fixes
Merge branch 'master' into macroVariant2