HDVID-419 #Resolve-issue #time 15m