HDVID-411 #Resolve-issue #time 20m