Merge branch 'master' into v3
Improves some scenes on short viewports
Optimised build
Merge branch 'v3'