Merge "Add a shelve/unshelve scenario"