Merge "Update auto on text." into main