HDVID-416 #Resolve-issue #time 30m