Backport v2020
Fast-forwarded merge from apertis/v2021dev1 branch to apertis/v2020 branch.
🟠 v2026dev0 entered Soft Code Freeze/Hard Feature Freeze, only bug fixes will be accepted • schedule
Fast-forwarded merge from apertis/v2021dev1 branch to apertis/v2020 branch.