Cdcr 15

Renaud, please verify that it's pull-request to the correct branch.