HDVID-417 #Resolve-issue #time 25m