Merge branch 'apa_exec_scaling_fix' into 'main'

[non-BE] [allow regression] Apa exec scaling fix

See merge request !2452