reduce code divergence
Merge branch 'dhwz'