Backports all neutron changes from master for 1.8.1