Merge branch 'autogen_uic_empty_fix_3_13' into release-3.13

Merge-request: !2667