Code

Merge branch 'js/stash'