updated distributable latest merge