Fix feature-D2
Merge branch 'feature-D'