Has anyone tried the new Sonoma Terrace beer offerings?

This sounds great and I can't wait to visit but I remember there being a small beer and wine spot next to the Blue Sky Cellar. Did they merge the two into one?

Thanks for any info!