Merge tag '3.5.90'