Create a branch that merges https://github.com/strata-org/Strata/pull/1076 and https://github.com/strata-org/Strata/pull/1077
Create a branch that merges strata-org#1076 and strata-org#1077