Sync with latest 1.2.0 Merchello, updated DB