Upstream formula
- and pando
-related changes
#1235
Merged
formula
- and pando
-related changes
#1235