HDVID-434 #Resolve-issue #time 20m