833 stacked area

Redirecting PR #851 to target develop branch