WVG-147 #Resolve-issue #time 1h 20m #comment Fixed