Merge "Fix prevent for resource leak" into devel/master