Merge "Fix svace issue on text controller" into devel/master