Merge "Fix prevent issues" into devel/master