chore(web): Merge remote-tracking branch 'origin/refactor/web/corrective-layout-abstraction' into refactor/web/corrective-layout-abstraction
