Incorporate GvR's changes from main peps repo