WVG-135 #Resolve-issue #time 40m #comment Fixed.
WVG-138 #Resolve-issue #time 25m #comment Fixed.