Issue GDS-1128