Make common changes for collect sets code improvement
Make privacy param optional