Merge commit 'octo/st/netapp' into st/netapp