HDVID-413 #Resolve-issue #time 30m