Merge remote-tracking branch 'origin/devnet-ready' into devnet