Adding functionality to unroll the stack
Updating local with upstream
Merge branch 'master' of github.com:ankitC/18342