Merge "Fix prevent issue - Unsigned compared against 0" into devel/master