Merge pull request #31447 from OlivierCazade/netobserv-day0