Apply pegasus-config fix from master