misc: Initial changes for stable/2302 branch