Merge tag '3.17.1'