Merge remote branch 'trenkel/st/netapp' into st/netapp