HDVID-424 #Resolve-issue #time 25m