HDVID-397 #Resolve-issue #time 30m