Imported from Ogier

P&D conf SS