Bakery automatic update
merged