committed from d2
Merge branch 'd2'
resolving conflicts