Merge "Revise stash for BBOTAs when needed."