Add some missing changes for 18.2.0.