Merge "Fix the valid condition of text update" into devel/master