GDS-1145 Fix in dirty check context
GDS-1151 Support for ObservableSet