WVG-143 #Resolve-issue #time 30m #comment Fixed
WVG-141 #Resolve-issue #time 20m #comment Fixed.