Master update: two new socket options