synchronization with cover_sync branch
synchronization with covers_sync branch