VID-1436

Fixes for ellipses P2, need to merge to 43 then cherry-pick to dev