chore(web): Merge remote-tracking branch 'origin/stable-13.0' into fix/web/cherry-pick/3658-fix-layer-separate