Merge "Fix SVACE error in npatch-data" into devel/master