misc: Initial changes for stable/2306 branch