Updated patch against rev 4657