[BUG] Fixing contrib shares issue without cache
[MERGE] Conflict with NEXT