Matching BeanStalk

Change-Id: Ifbcf293184b933f701aed1ba7dcf298b31067b55