Merge "Update text layout utcs" into devel/master