[Merge] Merging stash for step-0