Merge maintenance into main following 4.0.2 release (#2884)