Rebase from 'upstream'
Adding stack.xml
Revert "Adding stack.xml"

This reverts commit 14007f726d1ac1abd87942253b190fdcb47ae182.