Merge "Update approval test for text" into devel/master