Merge "Fix npatch visual issue" into devel/master