sync with latest gummy changes