[master] Optical flow improvements