HDVID-449 #Resolve-issue #time 30m