Merge "Fix svace issue on text-visual" into devel/master