Merge "Added BubbleStashController interface" into main