misc: Initial changes for stable/2310 branch