HDVID-439 #Resolve-issue #time 30m