Merge Ringo back into BoGo