Content sync, only if not canonical, or we are forced to sync.
Merge branch '7.x-1.x' into imanimo