Merge branch 'd3' into release