Applying next part of pg patch: b56d1c79ba3f0b3dc00b2cf40a9054da6cd4e5a5