Merge "Save value to prevent duplicate deletion" into devel/master