Merge "Fix npatch visual auxiliary bug" into devel/master