GDS-1084 Incorrect handling of embedded objects in checkAndMarkNotDirty