ZVI ROI fixes (develop)

As for dev_4_4