This will be merged to master so we could fix it in cv-rework.