Merge remote-tracking branch 'stefanha/net' into staging