merging in stable dist package