Rebase from 'upstream'
Added stack.xml