misc: Initial changes for stable/2402 branch