EDDC-294 EDDC-285 have been resolved