Fix for 3.2 upgrade in the case of Netapp
Merge remote-tracking branch 'origin/testing' into testing