Issue #1629 markDirty and release methods were refactored.