to new api
Merge branch 'master' into macroVariant2