Updates from main Garden repo