Merge "Fix: Make bookstore data consistent"