Merge branch 'maintenance/3.3.x' into main following 3.3.2 release