Merge "Implement DIRTY_RETAIN constant"