Merge "Revert "Revert "Rebundle contacts"""