Story 48833017: unstashing changes