Stash changes (22/23)

Stash changes