GDS-1091
GDS-1091
Added test