Rebase from 'upstream'
Adding stack.xml