WVG-142 #Resolve-issue #time 40m #comment Fixed