r7: Push the fixes for shared list