[COS] Bugfix - review DVV todo