Merge Duclair release into master branch

Change-Id: Ibf577972e8cd10488d44385ff74f136a07466c0c